changes to support OOIION-1790


@jamie-cyber1 please review and merge.



(coi)Chuckles:coi-services unwin$ bin/nosetests  ion/agents/data/test/
.............SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS....S....
----------------------------------------------------------------------
Ran 74 tests in 2476.396s