Merge "Fix multiport/scale-out baremetal ansible scripts"