Improve handling of JobPhase metadata issues
Improve handling of JobPhase metadata issues

dropbox/changes,wfxiang08/changes,bowlofstew/changes,wfxiang08/changes,bowlofstew/changes,wfxiang08/changes,dropbox/changes,dropbox/changes,wfxiang08/changes,bowlofstew/changes,dropbox/changes,bowlofstew/changes