Merge branch 'master' into ansible_orchestrator

diff --cc src/pybind/mgr/orchestrator.py
index 424e55a4ee2ddc11352aabf536b396afa3ea3aef,0dc084f3ff1a025045dfe96a497125f9c71215f5..ee9a289ecb3ee988781d25dfce1f4b92987ef4ed
--- 1/src/pybind/mgr/orchestrator.py
--- 2/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@@ -8,8 -8,7 +8,9 @@@ import sy
  import time
  import fnmatch
  import uuid
 +import string
 +import random
+ import datetime
  
  import six