Merge remote-tracking branch 'origin/36.0basic-coding-acl' into UAT

Conflicts:
	nbproject/private/private.xml