Consolidate duplicate layoutupdate4 sections.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>