Fix upstream merge

Bad merge

Change-Id: I96556962415a07aeb43e2fb24cdd4cbef1e2bb8a
Fixes: OPENSTACK-537