Merge commit 'ec9b4f1' into rc
Hotfix for test failure from d90d47d1b76ebb5d753e919afefb5d2457664da2.
Revert "Hotfix for test failure from d90d47d1b76ebb5d753e919afefb5d2457664da2."

This reverts commit 1a6f3dfa766234057c29b0b5a15b633c6bce9b23.
forgot to add this file
[maven-release-plugin] prepare release jenkins-1.526
[maven-release-plugin] prepare for next development iteration
updated changelog for release
updated changelog as a part of the release
merged back the RC branch