AppCode: temporarily fix for broken environment (OC-8606, OC-8593)
(cherry picked from commit 4cacdc94618a2e522c2d74370cd245484007bf75)
OC-8588 Rename Refactoring renames unrelated method
(cherry picked from commit 5da545a)