Yeah - probably; but I am a bit squeamish about inconsistency though; especially in 2.2.

Maybe we should add a 3.0 JIRA to add an alias 'executor' for all existing 'task-executor' attributes and make all new ones 'executor' (not including this because of the backport). ??