this closes JCLOUDS-737

cc @adriancole could please review it?
Please switch this to return a List (ex. s/Set/List/g in this file)