GPII-609 - Corrections to session support

@colinbdclark - This is the revision that is required for the overall GPII-609 fix. This is cumulative with https://github.com/fluid-project/kettle/pull/10