Fix layout.yaml rebase error

Looks like Gerrit?, rebased the previous commit wrong, see difference
between Patch set 2 and 3 in
https://review.openstack.org/#/c/19692/

Change-Id: If98ef992f46e0961470185d1c76b17c6a95770f5
Reviewed-on: https://review.openstack.org/19895
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins