[Run2_2017] More edits to the integration-test and service-x workflows

Created by: aperloff

Make sure to reset the user in the integration-test and service-x workflows. Also, the capitalization was wrong on one of the environment variables used in the service-x workflow.