Merge "Templates for configuration guide"
authorNarinder Gupta <narinder.gupta@canonical.com>
Fri, 8 Jan 2016 16:48:17 +0000 (16:48 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Jan 2016 16:48:18 +0000 (16:48 +0000)

Trivial merge