Merge from develop including multi-db, headless tests, and logstash