Merge "GENERIC-RESOURCE-API template fixes"
authorMarcus Williams <marcus.williams@intel.com>
Mon, 30 Oct 2017 19:23:47 +0000 (19:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 30 Oct 2017 19:23:47 +0000 (19:23 +0000)
Former-commit-id: b762951427de965aac2461d99017714f74b5fa15


Trivial merge