JBTM-1427 Various changes (including options for enlisting an arbitary number of resources and delaying prepare)