Merge "BUG-1382: eliminate QName.getPrefix()"