Restoring -Phive-thriftserver profile and cleaning up build script.