Adjust for latest commits to webscalesql-5.6.git