Merge "Fixing apex build system CentOS-7-1511 not found"