merge conflicts - fixes for utils/wirecheck utility

Change-Id: I072a6f9204e3e1bc10a19cefa1cff64d68521f9e