Merge "Use ApexContext for APEX data directory."