ITOOLS-9951: Ensure merge failure causes build failure
Removing irrelevant comment, was fixed long ago
ITOOLS-9981: Creating a jenkins configuration with invalid details no longer shows a 500
Merge pull request #36 in ATLASP/stashbot-helper from feature/itools-9951-fix-merge-conflict-build-success to master

* commit '26cdd7c33d2cd54ddb24bd5f76923e47b184bb8d':
  ITOOLS-9951: Ensure merge failure causes build failure
Merge pull request #37 in ATLASP/stashbot-helper from feature/fix-500 to master

* commit 'aa47101a6ffd81f7e0561f4042a035020136803a':
  ITOOLS-9981: Creating a jenkins configuration with invalid details no longer shows a 500
  Removing irrelevant comment, was fixed long ago
Updating for stash 2.8.4
Upgrade to stash 2.9.4

* PullRequestService.findById deprecated in favor of getById
* Added dependency on SAL (used to be picked up transitively)
Improved documentation
Merge pull request #38 in ATLASP/stashbot-helper from feature/better-documentation to master

* commit '5083a69e5efe17d313f2fbdb1f23d5afd00cab69':
  Improved documentation
Merge pull request #39 in ATLASP/stashbot-helper from feature/stash-2.9.4 to master

* commit '7b0f1a380354c72c934c656bde9d55d135045cc6':
  Upgrade to stash 2.9.4
  Updating for stash 2.8.4
Fix bug introduced in merge code

* Bug was introduced in 26cdd7c33d2cd54ddb24bd5f76923e47b184bb8d
* Bug impacts all merge builds
ITOOLS-10473: jenkins links no longer sometimes contain extra '/'
Merge pull request #40 in ATLASP/stashbot-helper from feature/fix-slash to master

* commit '1042b2cee86f9f36e511055612a566d12a2ed283':
  ITOOLS-10473: jenkins links no longer sometimes contain extra '/'
  Fix bug introduced in merge code
ITOOLS-10261: Fix for pull request from forked repo
Merge pull request #41 in ATLASP/stashbot-helper from feature/fix-formed-pull-request to master

* commit '015b6556c871f635540f26f883faf4639c648a9a':
  ITOOLS-10261: Fix for pull request from forked repo
ITOOLS-10437, ITOOLS-10629: Fix for race conditions in pull request updates
Fixing bug with AtlassianPluginTest unit test
Add velocity templating engine
Migrate job xml to velocity templates
New eclipse preferences format