Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Don't auto-configure plugin for upgrades

Change-Id: I4953271e3757abe7878c8c955d1511a9b2373476