Merge "Fix imports for github.com/sirupsen/logrus"