CLOUDIFY-1229
fixed AbstractMachinesSlaEnforcementTest - some tests need to use 128 MB of container size and some need 250
Merge remote-tracking branch 'origin/master'