Fix for NPE when trying to use aura:handler in AotP @bug W-2103924@
Merging origin/dchasman/master-pending-W-2103924 into master