chanjo integration. Fix for #494

Here is the integration with Chanjo. It was tested using the test only ChanjoPipeline

Also, this includes a fix for #494. A unit test is provided.

-jk