jaas: fix java6 compatibility
Merge remote-tracking branch 'upstream/2.2' into 2.2