Sync three-part RPC versions support from Oslo

Change-Id: Ia93e7a6d978374e0dcf49c2be230c67e41a7bd14
(cherry picked from commit 337a722ce3e7c4c96c0b1f75bbd88c0ecced809b)
Merge "Sync three-part RPC versions support from Oslo" into milestone-proposed