innodb_buffer_pool_size set to 10240M if memory > 15G
Merge branch 'hotfix/4.0.4.5' into smm_master