Merge "Apex: remove file-paths from triggers for verify"