Merge proposals dependent on lp://staging/~ocb/ocb-addons/ocb-addons-7.0_lp1096097_timesheet_inaccurate

1. ocb-addons-7.0_lp1096097_timesheet_inaccurate
2. Dependent merge proposals