Realigned the Maven module names. Also re-applied the fix for CXF-2578 as this is the only fix that went in after CXF 1.1 was released.