Merge "Fixes build and deploy options for SFC/ONOS"