Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev