Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Remove documentation links from admin page
  NPE when deleting draft patch set when previous draft already deleted
  Fix example for 'test-submit rule' in Prolog cookbook

Change-Id: Ib96358c1fe6a953d17e88fd9f5bd4832fd51334a