@btford please review
@epotvin please remove merge commits and rebase git rebase against master. also please update the commit message to follow our format: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit

Rebasing didn't work well... I created another PR : #5724

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.}