NOJIRA Final commit before attempting rebase into master
NOJIRA Undo change to TaskServiceImplTest.groovy