Bug 1515929: Changing the insert of usr custom layouts
Rewrite to use ensure_record_exists instead of re-inventing
the wheel.
behatnotneeded: Covered by existing tests
Change-Id: Id57be0e00f14ab65dd40b4ef13f696e72f608d46
Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>