Merge branch 'feature/debugging' of https://github.com/wu-sheng/sky-walking into feature/debugging

# Conflicts:
#	apm-collector/apm-collector-boot/src/main/resources/application.yml

apm-collector/apm-collector-boot/src/main/resources/application.yml

@@ -26,5 +26,3 @@ storage:
     cluster_name: CollectorDBCluster
     cluster_transport_sniffer: true
     cluster_nodes: localhost:9300
\ No newline at end of file
-
-