Lps 51439

Brian, the first commit is necessary.

The second one, is shortcuting the portal-impl/build.xml jar's logic which costs about 5 seconds to run. But this is not necessary, just nicer to have it. If you like to keep the build simple, you can drop the second commit.