Changed some ## terms so they are replaced from build.properties file