Merge branch 'stable-2.16'

* stable-2.16:
  dev-plugins.txt: Recommend ServletModule instead of HttpPluginModule
  AbandonUtil: Keep trying to abandon more changes despite single failure
  Fix polygerrit_plugin rule to include deps

Change-Id: Iddf4ea708fb057fa03b31e0ae81de16f90a9ef36