NOJIRA Decouple and De-aggregate uportal-java-api.

Basically a cherry-pick and squash of
8eb93cc1a9466f2da3c4fb31b78bde8a4afafad2 and
1538b6cc1aa163cee71343faa8058b9f402d92cd, fixed up for the
ssp-rel-1-0-patches branch.