fix selecting a database server in a rake task

Change-Id: I735d6fb77debcf439ba44db616a90b281d5fab41
Reviewed-on: https://gerrit.instructure.com/40994
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
fix Relation#merge in Rails 4

it allows hashes. we just don't care about that for switchman

Change-Id: I17192535a4d18fe26260c19a02ccc913db5e560e
Reviewed-on: https://gerrit.instructure.com/41661
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
bump version

Change-Id: Ibb7f7417d1417460c4ecf8ac8bf546611ed29cc9