Merge "Added templates for feature configuration description/reference"
authorBin Hu <bh526r@att.com>
Wed, 13 Jan 2016 18:56:20 +0000 (18:56 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 13 Jan 2016 18:56:20 +0000 (18:56 +0000)

Trivial merge