[No reviewer] Update rcs

Matching updates for [Sprout #572] (https://github.com/Metaswitch/sprout/issues/572) and cpp-common update