Fixed #527
Added prefs to force to use of the API for Alarms and KWLs
Moved API options
Merge remote-tracking branch 'upstream/master'