Merge "Updated xacml s3p tests" into istanbul