Merge "Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected"