Merge "Configure console proxy settings for nova-cpu.conf"