Build against CommandExecutorBase 1.5.2, also change comments