Merge "switch to valid aaf url property"

diff --combined etc/dmaapbc.properties
index 71f0b66,15af191..fa7f2cd
--- 1/etc/dmaapbc.properties
--- 2/etc/dmaapbc.properties
+++ b/etc/dmaapbc.properties
@@@ -174,12 -174,12 +174,12 @@@ CredentialCodecKeyfile: etc/LocalKe
  #
  # This overrides the Class used for API Permission check.
  # This allows for a plugin policy check, if needed
 -#ApiPermission.Class: com.company.policy.DecisionPolicy
 +ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll
  
  #
  # URL of AAF environment to use.
  #
- aaf.URL:      https://localhost:8095/proxy/
+ aaf.URL:      https://localhost:8100/proxy
  #
  # TopicMgr mechid@namespace
  #
@@@ -201,18 -201,6 +201,6 @@@ aaf.AdminPassword:        pwdNotSe
  #################
  #################
  # PolicyEngine Properties
- #
- # Flag to turn on/off Authentication
- UsePE: false
- #
- # Argument to decisionAttributes.put("AAF_ENVIRONMENT", X); 
- # where X is:  TEST= UAT, PROD = PROD, DEVL = TEST
- #
- PeAafEnvironment: DEVL
- PeAafUrl.DEVL:  https://localhost:8095/proxy/
- PeAafUrl.TEST:  https://aafist..onap.org:8095/proxy/
- PeAafUrl.PROD:  https://aafprod.onap.org:8095/proxy/
- 
  #
  # Name of PolicyEngineApi properties file
  PolicyEngineProperties: config/PolicyEngineApi.properties