Merge "Fix deployment of sniro and sdnc"