ISIS-482: applying patch from Oscar Bou

Author: o.bou@gesconsultor.com

Signed-off-by: Dan Haywood <danhaywood@apache.org>
ISIS-482: tidy-up
ISIS-485: applying patch from Oscar Bou

Author: o.bou@gesconsultor.com

Signed-off-by: Dan Haywood <danhaywood@apache.org>
ISIS-485: fixes to integtest support tests

... were too brittle.