VFS-1172, merge with develop

Author: lopiola

docker/ct_run.py

@@ -223,9 +223,9 @@
 #                  command=['python', '-c', command])
 #
 # os.remove(new_cover)
-# if args.cover:
-#     for file in env_descs:
-#         os.remove(file)
-#         shutil.move(file + '.bak', file)
+if args.cover:
+    for file in env_descs:
+        os.remove(file)
+        shutil.move(file + '.bak', file)
 #
 # sys.exit(ret)