Fix menu manager error if Zenpage is not enabled.
Merge remote-tracking branch 'upstream/master' into upstream
Proper fix for zenpage not enabled

Also fixes issues with mixed case on switches. Upper case items already
exist in the database, so have to be handled
fix for missing title warning