Fixes for ed7287a. Fix test case broken as a result, fix setting database_connection from user data in the configuration directory use case (give userdata a slightly high priority).