Merge "Fix checks for presence of old-style 'enabled' key"