Merge "Adds new merge builds script for use in merging two non-dist builds."