fixed conflict.
CLOUDIFY-2226 remarked out space document creation, to be returned next spring
CLOUDIFY-2180 Pass MachineDetails into context
Merge pull request #75 from itaifrenkel/master

CLOUDIFY_2180 Pass MachineDetails into context
Build version advanced to 5991-160
Build version advanced to 5991-162
Build version advanced to 5991-166
CLOUDIFY-2180 removed unused import and cleaned comments