Merge "s3p stability xacml-pdp documentation"