I have the same problem and I have raised bug 1737, but would appreciate if anyone can suggest a command line workaround in the meantime.
I first tried a yum update from the server-manager software installer panel and when that failed because of package conflicts, I tried an upgrade from CD. The CD install did not see the existing installation, which is still working as normal.
Thanks, David