Merge "Update templates to using local-*.yaml"
authorAnil Belur <abelur@linuxfoundation.org>
Wed, 31 Jan 2018 22:50:12 +0000 (22:50 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Wed, 31 Jan 2018 22:50:12 +0000 (22:50 +0000)

Trivial merge