Bug873470 - Sequelize update broke the cornfield tests and lint fixes