Fixed for 3.1GA

This manager blueprint works against cloudify-cosmo:master
@uric: here you go! Had no issues with duplicate keys, please let me know if still hit this problem.