Feature/fix deploy data loader tasks

@barnabyalter, this PR is based on the Rosie one. We should probably merge Rosie first and then I'll rebase from development for that one so we have a clean code history.