Merge "Skip non-commits when verifying access for 'add branch' operation" into stable-2.6