fix(upgrade): make upgradeAdapter upgrade angular 1 components correctly

[alxhub]

#7588 with squashed commits

[googlebot]

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

[mary-poppins]

Merging PR #7951 on behalf of @alxhub to branch presubmit-alxhub-pr-7951.

[jonricaurte]

Is it possible to have another beta release? I was hoping this would get into beta 14 since we are currently running into this issue everywhere since we upgraded most of our directives to components when 1.5 was released. Thanks!

[mhevery]

@jonricaurte I am sorry, it is unlikely that we will cut another release until wednesday.

[jonricaurte]

@mhevery Thanks for the update! Looking forward to both this pr and shuhei/babel-plugin-angular2-annotations#19 to get into releases so then the upgrade path should be smoother.

[angular-automatic-lock-bot]

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

_{This action has been performed automatically by a bot.}