[fixed JENKINS-15676] Finalizing
[JENKINS-16487] Added test