Resolved merge conflicts
Fixed travis-ci builds to run mysql tests