Try to improve stability of CommandExecutorTest
Automatic merge from branch-4.5

* origin/branch-4.5:
  Try to improve stability of CommandExecutorTest