Fixed incorrect names while logging in Jobs and renamed scheduler bean ids.
Merge remote-tracking branch 'tw_kaizer/master' into develop