Small extensions to checkout configuration
- allow use of a custom branch of https://gitlab.cern.ch/lhcb-core/LHCbNightlyConf
- extend
checkout_opts['merges']
to support merge descriptors like(merge_id, commit)
where the the commit id is used despite what is the latest iteration on the matching merge request (needed for LBCORE-1712)