Fix for ACT-1837: CommandContext Logs and Re-throws Exceptions (Regression)
Fix for failing Jenkins
ACT-1840: Allow to set a 'category' on tasks
Merge remote-tracking branch 'upstream/master'