Revert "Revert "consistency with Amanzi pull request #531" - this needs to be on branch til Amanzi closes pull request"
Revert "Revert "consistency with Amanzi pull request #531" - this needs to be on branch til Amanzi closes pull request"

This reverts commit 9963d042e647e9fa34cc7ac7ae306f02ed2eacb5.

amanzi/ats-dev,amanzi/ats-dev,amanzi/ats-dev