Brings in a few fixes from the master branch. They all relate on how mondrian handles concurrent queries with flush operations, somewhat related to mondrian-1217.