Merge branch '6.0' into 7.0

Author: himeshr

.circleci/config.yml

@@ -131,7 +131,7 @@ jobs:
           paths:
             - ./node_modules
 
-# https://serverfault.com/questions/265675/how-can-i-zip-compress-a-symlink
+      # https://serverfault.com/questions/265675/how-can-i-zip-compress-a-symlink
       - run: zip --symlinks -r ~/rules-server.zip ../rules-server
 
       - run: tar -czvf ~/rules-server.tgz  -C ../rules-server .
@@ -153,7 +153,7 @@ jobs:
 
       - store_artifacts:
           path: ~/artifacts
- 
+
   build_docker_image:
     docker:
       - image: docker:git