Merge "project-ize kibana_dashboard"