[fixed JENKINS-16620] A better solution
[JENKINS-16620] Addded test for ANY