merge MAPREDUCE-4671 from trunk. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha.