Merge "Creating a template for feature projects to produce userguide and scenario...
authorChristopherPrice <christopher.price@ericsson.com>
Fri, 12 Aug 2016 12:02:08 +0000 (12:02 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 12 Aug 2016 12:02:08 +0000 (12:02 +0000)

Trivial merge