Support new --trunk-is-master option