Master aic

Added aic:batchUid for assets and XACML-related definitions in CND. 
Merged latest mainstream commits.