Implements JENKINS-22964 - Additional configuration selectors