Merge "Fix ApexTestCases.ApexFileTest#VerifyApexVerity" into rvc-dev