Merge "Update NSH patches"
authorMichal Skalski <mskalski@mirantis.com>
Wed, 13 Jul 2016 14:16:53 +0000 (14:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 13 Jul 2016 14:16:53 +0000 (14:16 +0000)

Trivial merge