Rebase cleanup

Updating build properties for jenkins builds from github.