Add controller= and model= back into comps and apps  @bug W-2102749@
Merging origin/dchasman/master-pending-W-2102749-2 into master