Merge "Add NovaVNCProxy back into endpoint_map"