Mail sources: add the keepalive variable
Avoid blocking the CLI or  API users if a rescan is already in progress
Friendlier error messages on bogus set
Better tracking of internal rescan state via. the event log
oops