fix remaining issues with optional coupling refs #2358
Getting make doc working for combined module
refs #2986
fix small issue created when peacock was changed in #2781
Re-designed common parameter applicaton (closes #2878)