CM fixed unit tests
Merge branch 'update/aclAndJava8' into dev