Fixed build scripts to package correct files

Before the TestResults.xml file was also being packaged.
Moved package output from /build/out to /build/out/package.
Merge branch 'dev'