Finally I backported r1502121, resolving conflicts by hand
"Applied fix from trunk for revision: 1502121" 
r1502121 | jleroux | 2013-07-11 07:38:47 +0200 (jeu., 11 juil. 2013) | 3 lines

No functional change.
When I reverted r1311214 for "set different ports for testing in a CI environment (e.g. Jenkins)" I did not notice Jacopo's also changed some ports value at r1324614
This reverts r1324614 to have things consistent. I don't backport (only R12.04 is concerned) because as long as catalina/ofbiz-component.xml is consistent (port =+ 1) things are working

git-svn-id: 13f79535-47bb-0310-9956-ffa450edef68
4 files changed