Against master.
Merge pull request #548 from twitter/klin_jobconf_tool_v2

Against master.