fix remaining issues with optional coupling refs #2358
Merge pull request #3035 from friedmud/optional_coupling_2358

fix remaining issues with optional coupling
Merge commit 'd9d200d2363d969ad8cf3e8eae875cd4b1123db0'