Merge changes If2ef6c5c,I4b8e0a28
authorSam Hague <shague@redhat.com>
Wed, 4 Nov 2015 01:48:46 +0000 (01:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 4 Nov 2015 01:48:46 +0000 (01:48 +0000)
* changes:
  Fix nsh flow
  fix for missing sfc feature


Trivial merge