Merge "DmaaP topic properties change for xacml-pdp"