CLOUDIFY-1229
added enforceNumberOfMachinesOneContainerPerMachine and createSlaOneContainerPerMachine and refactored