Also renamed 'vnc_enabled' to 'enabled', and 'vnc_keymap' to 'keymap' now that those options are prefixed by the 'vnc' group. Change-Id: I2ff668d4ebd8e6ebf9bf4e8ca5b077958f051144 Closes-Bug: #1447528