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

* changes:
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers

diff --combined src/main/resources/application.properties
index 2ff9205,ec053e0..aa92820
--- 1/src/main/resources/application.properties
--- 2/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -18,7 -18,7 +18,7 @@@
  # limitations under the License.\r
  # ============LICENSE_END============================================\r
  # ===================================================================\r
- # ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ #\r
  ###\r
  \r
  info.build.artifact=@project.artifactId@\r
@@@ -125,9 -125,9 +125,9 @@@ clamp.config.sdc.decode.service_ids=cla
  #\r
  #\r
  # Configuration Settings for Policy Engine Components\r
 -clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123\r
 -clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123\r
 -clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8085/pap/ , testpap, alpha123\r
 +clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
  clamp.config.policy.notificationType=websocket\r
  clamp.config.policy.notificationUebServers=localhost\r
  clamp.config.policy.notificationTopic=\r
@@@ -170,9 -170,9 +170,9 @@@ clamp.config.op.controller=amsterda
  clamp.config.op.policy.appc=APPC\r
  #\r
  # Sdc service properties\r
 -clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/\r
 -clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8085\r
 -clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/services\r
 +clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/\r
 +clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080\r
 +clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services\r
  clamp.config.sdc.serviceUsername=clamp\r
  clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981\r
  clamp.config.sdc.artifactLabel=blueprintclampcockpit\r
@@@ -196,12 -196,12 +196,12 @@@ clamp.config.action.insert.test.event=f
  clamp.config.clds.service.cache.invalidate.after.seconds=120\r
  \r
  #DCAE Inventory Url Properties\r
 -clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8085\r
 +clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080\r
  clamp.config.dcae.intentory.retry.interval=10000\r
  clamp.config.dcae.intentory.retry.limit=3\r
  \r
  #DCAE Dispatcher Url Properties\r
 -clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8085\r
 +clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
  clamp.config.dcae.header.requestId = X-ECOMP-RequestID\r
  \r
  #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !\r