First step in fixing JENKINS-19658
Fixed JENKINS-18107
Fixed JENKINS-19658
Fixed JENKINS-19658
Final fix for JENKINS-19658
Fixed JENKINS-19657
Merged changes from upstream dev
Javadoc and style fixes
Integrating LoadRules2