Merge "apex spec file is one directory deeper"