Bug #3441 - Rename util/xhr2 -> util/xhr
Review fixes for 28e7d963