Fix missing third party class files in build
Merge branch 'master' into notest-ENG-4779-voltcounters