[JENKINS-19559] - Noting fixes in #1124 (jenkins-1.553)

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
Noting JENKINS-18654 in 1.524