WELD 1687

Port WELD-1550 and WELD-1683 to EAP6.2.x branch