Creating new Web Certificate Key Pair causes O and OU to be flipped

Creating a new Web Application Certificate (Key Pair), results in the O and OU to be flipped.  Example: the Admin user sets the O to be Organization and OU to be Organizational Unit, then when the cert is created it will look something like O=Organizational Unit and OU=Organization.

Update June 7th 2013 - A fix has been checked in for this issue and should be available in a upcoming patch.

Workaround:
When creating the cert, set the O to be the OU info and the OU to be the O info, so that when the cert gets created it will show up correctly.

The Widgets got flipped.