Pulled in build server improvements from alpha branch (swc-devel 17aff1c0a62edafdccfe51b44252735f4a9b15fd)