Merge "Configure console proxy ports in nova-cpu.conf"