Merge "Remove rdp_console option"