Minor buildscript cleanup and preMerge task