Merge "Fix NPE in JobPackageTracker" into nyc-mr1-dev