Merge branch 'stable-2.6' into stable-2.7 * stable-2.6: Fix compilation failure in RefControlTest Verify access to source ref during add branch operation Change-Id: I4a6c61e924baa44142ed0ade771a08bd20d09f79