Clean up of proteus.linux2.yaml#997

Merged

cekees merged 8 commits intohashdist:stable/proteusfrom

erdc:zhanga/update_default

Feb 7, 2018

Commits on Oct 5, 2017

Merge pull request #1 from erdc/update_erdc_master
cekees
authored

Commits on Feb 5, 2018