Matt Clarkson authored Feb 05, 2018 and Robert Lyon committed Feb 16, 2018

Taking work developed by Matt C and adjusting it to be more of a
session handler option.

behatnotneeded

Change-Id: I443d9e67d2322c995f9277ce1ee835092dc6c218
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>