fixed some CodeNarc violations
fixed some CodeNarc violations, fixed and activated some deactived tests
Merge branch 'master' into jdk8