Merge branch 'sam_2537' into sam_2563_sindex_block_v113_merge
Merge branch 'sam_2563_sindex_block_v113_merge' into sam_2563_ii
Made resolve_protocol_version return CLUSTER, not LATEST, and static_assert that they are the same.