Merge "Rename ApexContext to ApexEnvironment." into rvc-dev