Fixed branch selection for mars for rock-flavors != master