Merge "s3p xacml documentation"