Fix compilation error--ref to getopt() w/out needed include.
Fix compilation error--ref to getopt() w/out needed include.
Use canonical modulefile/roll-test build files.