Merge proposals dependent on lp://staging/~pieq/checkbox/fix-1561821-new-input_id-parameter-for-input-jobs

1. fix-1561821-new-input_id-parameter-for-input-jobs
2. Dependent merge proposals