Generic build split

Martinez, Eric M. requested to merge github/fork/emartinez-usgs/generic-build-split into master Aug 23, 2018