Merged from Trunk revision 685573: Fixed border trait parsing for the area tree XML when CMYK or ICC colors were used.