don't modify configure.conf when make model
Merge branch 'master' of github.com:OpenClovis/SAFplus-Availability-Scalability-Platform