Merge changes Ib3c339b2,I47888da8,Ifdc5a4d9,I2f7b7417,If10e2dff, ...

author Eddy Hautot <eh552t@intl.att.com>

Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)
author Eddy Hautot <eh552t@intl.att.com>
Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)
diff --cc src/main/resources/application.properties
Simple merge
author	Eddy Hautot <eh552t@intl.att.com>
	Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 24 Apr 2018 22:38:06 +0000 (22:38 +0000)