CORE-7471 #resolve svn path=/trunk/; revision=60653
- Change build files accordingly svn path=/trunk/; revision=37412