Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix mocks in ProjectVersionRefUpdateTest

Change-Id: Ic935d8316a1ba09e381cb854c003cc472fac9957