Merge "[DCAEGEN2] Update bootstrap and cloudify-manager versions"