Combine ovssfc patches.

Change-Id: I9d0e6f29c8ea837ceccec1073fea549ad77a2b3f
Signed-off-by: Sam Hague <shague@redhat.com>
Merge "Combine ovssfc patches."