Clean up usage of the default output stream. Fixes issue 1007.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=53087244
Adding @jaggerInject, @jaggerProvide, @jaggerModule tags.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=53164317
Merge remote-tracking branch: upstream/master