Merge fixes with trunk: 14348987, 16998431

14348987 - invalid absolute URL

16998431 - JAXB UNMARSHAL PERFORMANCE ISSUE