Merge "enable onos in joid deployment"