CM upgrade script for ACL
Merge branch 'update/aclAndJava8' into dev