Use RBT by default and correctly determine if version is >= 0.6

Review: https://reviews.apache.org/r/26420
Differentiate between slave and offer ids

Review: