Merge "Fix NPE in JobStore when jobs.xml is empty."