Merge -r 1416483:1416484 from trunk to branch-2. Fixes: YARN-72. NM should handle cleaning up containers when it shuts down. Contributed by Sandy Ryza.