Fix issue with incorrect controllerdef access check

@rev goliver@
@bug W-2385619@
Merging origin/dchasman/master-pending-fixControllerDefAccessCheck into master