Merge "Revert "Move gerrit scripts into puppet module""