Bug 1085384 - Use page.upperCase instead of layout.upperCase as the structure has been moved to page during normalization.
Merge pull request #25349 from mnjul/bug_1085384_uppercase_not_correctly_retrieved

Bug 1085384 - Use page.upperCase instead of layout.upperCase as the structure has been moved to page during normalization. r=timdream