Task clean-up enhancements
   * RUNNING, WAITING tasks will get aborted after loaded from MapStore