Repaired logic bug, added test for this bug, resolved ordering in OutputWarehouse (closes #2661)
Merge pull request #2663 from aeslaughter/recover-2661

Repaired [Outputs] related logic bugs
Merge commit 'e32d29b962994e0c98c57e272f17f7d3818332ab'