Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files
