Add testing branch capabilities

Extend to use back merging from hotfix changes into testing and developbranches.