Add merge-check to pylockfile, test for merge-check

pylockfile has been missing the merge-check job, add it.

Enable the merge check as part of layout checks.

Change-Id: I7b4d5fdf99ae34af3b22645f120e3182e5ccaa31
Merge "Add merge-check to pylockfile, test for merge-check"