Forward merge from master to 1.2.x branch, 

Enabled the @AccessControl flags. Switched EAP console version 2.2.8