[xacml] Tidy spec file.
[xacml] Fix inheritance patching.