Merge remote-tracking branch 'origin/master' into release-6.0.1

# Conflicts:
#	app/bamboo.yml

Author: SergeyMoroz0703

app/bamboo.yml

@@ -19,7 +19,7 @@ settings:
     WEBDRIVER_VISIBLE: False
     JMETER_VERSION: 5.2.1
     LANGUAGE: en_US.utf8
-    allow_analytics: Yes                # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
+    allow_analytics: Yes               # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
     view_all_builds: 15
     view_build_result: 15
     view_build_configuration: 10