CLOUDIFY-1229
refactored - machine memory capacity is evaluated and not "predicted approximately"
Merge remote-tracking branch 'origin/master'