View encapsulation fix#4524

tbosch wants to merge 2 commits intoangular:masterangular/angular:masterfrom

tbosch:view_encapsulation_fixtbosch/angular:view_encapsulation_fixCopy head branch name to clipboard