Use Map instead of HashMap in RequestDescriptor. Backport of r1645743 from trunk resp. r1645913 from TC 8.