Merge "Convert nsh_sfc to be Packer compliant"