Merge pull request #231 from dreske/changelog-to-branch

Implemented 'Changelog to branch' extension
Merge pull request #235 from galbramc/master

[FIXED JENKINS-23179] git pre-merge fails with matrix project
Merge branch 'master' into custom