Merge "Codec2: remove unneeded const from query/commit methods"