Restore the original dir after node installation; ru translations db
DB name correction
Update the test DB name in phpunit.xml
Make Doctrine happy with a DummyDesignDocument
Make the tests run again
Resolve the merge conflict