Fixed branch selection for mars for rock-flavors != master
Merge remote-tracking branch 'autobuild/master' into stable_and_release