2017.04.27 - oddjob_admin

YRFWG_CM_fix_00863