squashes feature branch in git preserving master Change-Id for gerrit