Plain Diff
this assimilates the devscripts repo entirely. Change-Id: Id56417522677b843dd6a984b276d79d220f57eef