Fixed JENKINS-19657
Merged changes from upstream dev
Javadoc and style fixes
Integrating LoadRules2
Cleanup, better code less compiler and findbugs warnings
Fixed functional test on linux