Now that the conflicting directory has been cleared out.
Change-Id: I7fb86258a431c4ee8ecf94eab0c6e95ceeb67b03
Reviewed-on: https://review.openstack.org/29826
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins