CLOUDIFY-1229
test MachinesSlaEnforcementTwoManagementMachinesByonTest disabled for tests
Merge remote-tracking branch 'origin/master'