GPII-434: Reverted to when.js version 1.8.1 - versions after 2.0 are fully asynchronous and make a mess of Kettle's callback wrappers. Swapped order of accumulating callbacks in server test bootstrap