Merge "Revert "Adds Calipso scenario""
authorTim Rozet <trozet@redhat.com>
Thu, 21 Sep 2017 19:05:03 +0000 (19:05 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Sep 2017 19:05:03 +0000 (19:05 +0000)

Trivial merge