Bug 981225 - Use short revisions to fix try upload dir path, r=jlund
Bug 981225 - Switch from using buildtime to buildid, r=jlund
bug 1011796 - aurora+beta+release merge day script. r=rail
bug 1028916: FxOS eng builds shouldn't receive updates - try to unset update channel for eng builds. r=aki
Bug 1035609 - Clobber b2g hazard build before running, r=aki
Bug 1035624 - Update xre for gaia_unit tests, r=nthomas
Bug 978507 - for mozharness desktop builds, replace usage of client.mk with upcoming mach/python script, r=aki
backing out bug 978507, sha - df0fdd892133, commit based off wrong patch
Bug 978507 - for mozharness desktop builds, replace usage of client.mk with upcoming mach/python script - correct patch, r=aki
if mach build doesnt return 0, make it a failure
Merge branch 'master' of https://github.com/mozilla/build-mozharness
Merge branch 'master' into build-cfg-integration

Conflicts:
	configs/builds/releng_base_mac_64_builds.py
	configs/builds/releng_sub_linux_configs/64_asan.py
	configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
	configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
	configs/builds/releng_sub_windows_configs/32_non_unified.py
	mozharness/mozilla/building/buildbase.py
	scripts/fx_desktop_build.py
disable mock for mac builds