[PAXWEB-491] - PAXWEB-328 is incomplete for 1.1.x some of the fixes in
trunk should be moved to 1.1.x