Make sure all the PRs on cloudify-manager-blueprints are reflected in the new code

[mcouthon]

From @mcouthon on September 24, 2017 12:24

All the PRs up until Sep 19th, 2017 (this PR) are merged, (except for this PR).

Copied from original issue: mcouthon/cloudify-manager-install#39