Add testing branch support

Extend to include backmerging from hotfix branches into testing anddevelop.