CLOUDIFY-1229
changed calls for enforceNumberOfMachines into enforceNumberOfMachinesOneContainerPerMachine in scaleOutMachines test