Merge changes I2b52f659,I894bb969
authorCedric Ollivier <cedric.ollivier@orange.com>
Thu, 13 Sep 2018 08:19:34 +0000 (08:19 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 13 Sep 2018 08:19:34 +0000 (08:19 +0000)
* changes:
  Add OpenStack constraints
  Update to OpenStack master


Trivial merge