CAINT-1356 Reverted to commented out jboss.relative.path to fix upgrader.
Merge branch 'CAINT-1356' into develop