Merge in code compliance changes and build.xml updates