Merge changes Ieae3558e,Ibc30de5e,I3415c5c4

* changes:
  Fix indentation for EnforcePermissionDetectorTest
  Remove support for @EnforcePermission on classes
  Compare nested values for EnforcePermissionDetector