Rehydrate step in TaskStep.getProject, take 2, fixes https://infobelt.atlassian.net/browse/ORION-196
Merge remote-tracking branch 'origin/master'