Merge "[cloudify_ims] Support Cloudify 4.0"
authorCedric Ollivier <cedric.ollivier@orange.com>
Wed, 5 Jul 2017 11:03:23 +0000 (11:03 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 5 Jul 2017 11:03:23 +0000 (11:03 +0000)

Trivial merge