Upgrade mapentity and remove workarounds for mapentity bugs
Fix travis conf to allow failures in integration tests