Merge branch 'master' into stable-4.0

Merge branch 'master' into stable-4.0

* master:
  [gitflow] fixed build warnings
  [gitflow] fixed unnecessary locking of resources
  Sort branches in Push to Gerrit case insensitive
  Extend EGit to allow use of git-flow
  Automatic wildcard matching "Add Git repositories" dialog
  Update to Jetty 9.2.10
  Update javax.servlet to 3.1
  Ensure commit body is retained in GitSynchronizeData
  Make PushResultDialog amodal
  Fix and re-include Easymport wizard
  Exported missing package and update uses directives
  Fix NPE in CommitGraphTable.doPaint()
  Properly style PushResultDialog in dark theme

Change-Id: I276a7a5ea35134388df8bbeb30be1e75cd9a316a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>