Merge "endpoint_map: bump nova api from 2.0 to 2.1"