CLOUDIFY-2599 added -k flag to enable force keep server up even if bootstrap fails
CLOUDIFY-2599 fix tests
CLOUDIFY-2599 removed k flag, left only long version of flag
Merge branch 'develop' into feature/CLOUDIFY-2599-enable-force-keep-instance-up-even-if-bootstrap-failed
Merge pull request #34 from CloudifySource/feature/CLOUDIFY-2599-enable-force-keep-instance-up-even-if-bootstrap-failed

Feature/cloudify 2599 enable force keep instance up even if bootstrap failed