Merge test for #11623 to 7.0.

The fix itself is not required due to the changed style name handling.

svn changeset:25902/svn branch:6.8
svn changeset:25903/svn branch:6.8

Change-Id: I95a9adbcac82236017369003765735bbaacfe980