Merge "Add api-resource-locks feature"
authorJorge Hernandez <jh1730@att.com>
Tue, 3 Apr 2018 21:33:29 +0000 (21:33 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 3 Apr 2018 21:33:29 +0000 (21:33 +0000)

Trivial merge