Merge branch 'stable-2.11'

* stable-2.11:
  Reenable revert button when revert is cancelled
  Add missing --newrev parameter to change-merged hook documentation

Change-Id: If653e664af51db9eaca6724fdf6a5083cc00f1f0