merge users for shawn hartsock

Launchpad id: hartsock but gerrit id: hartsocks

fixes bug: 1269094

Change-Id: I32f78ab8219f425c02e27054c411198e4050d81d