Merge branch 'feature/CLOUDIFY-2288-change-deployment-blueprint-api' into feature/CLOUDIFY-2296-bootstrap-an-existing-machine
CLOUDIFY-2296

Added optional argument to bootstrap command which specify an existing management machine IP.
If provided, the bootstrap process will skip the part where it startsa vm and directly install cosmo management on that machine
CLOUDIFY-2296

Fix runtime error, calling upload method of rest client with wrong arguments
Merge branch 'develop' into feature/CLOUDIFY-2296-bootstrap-an-existing-machine
Merge pull request #5 from CloudifySource/feature/CLOUDIFY-2296-bootstrap-an-existing-machine

Allow bootstrapping an existing machine