bug 857696 - add non-fastforward detection & prevention for b2g repos. r=rail
Merge remote-tracking branch 'origin/master' into beagle