Make the db and statemachine default is the same
Changed default in the database for the statemachine
Fixed some hound notices
Merge pull request #6761 from jvanbaarsen/fixed-statemachine-warning

Make the db and statemachine default is the same