Fix db_config_with_versions arity change and backport

[vprigent]

Not sure how we could reliably test this one, so I've linked the two commits that forced your changes and then this change.

I've also left the railtie version check in here to make the intent clearer that this is a fix for a private rails api and not a change.

Would fix #335