Update dependencies and qualifier.
Bump version to 1_04_00
Merge branch 'fnal/upstream'

Merge upstream directly to keep track of latest development