Merge "rebuild directory structure of Kibana dashboard"