Merge "Run SingleFeatureTest on features/netconf"