Merge "Fix Yamllint Violations for jjb/conductor"
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 12 Sep 2017 20:26:30 +0000 (20:26 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 12 Sep 2017 20:26:30 +0000 (20:26 +0000)

Trivial merge