Merge changes Ib497aca6,Ic6def54a into pi-dev

* changes:
  Make anomaly jobs persistent.
  Update job ids in Settings