Merge -r 1428313:1428314 from trunk to branch-2. Fixes: YARN-192. Node update causes NPE in the fair scheduler. Contributed by Sandy Ryza