Merge from work at LLNL
Merge branch 'master' of https://github.com/OpenFortranProject/ofp-sdf

Merge from integration with ROSE on ParallelGateway machine.
Merged in Dan's changes from LLNL visit.