[FABRIC-950] Decouple 6.1.x versions from master