Merge -c 1238255 from trunk to branch-0.23 to fix MAPREDUCE-3764. Fixed resource usage metrics for queues and users.