mnk-5457, merge 8090 in 4.0.4-rc

git-svn-id: http://svn.terracotta.org/svn/ehcache@8179 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5567 : allow more time for the cache to bootstrap

git-svn-id: http://svn.terracotta.org/svn/ehcache@8180 b9324663-ca0f-0410-8574-be9b3887307d
merge bulkload improvement

git-svn-id: http://svn.terracotta.org/svn/ehcache@8181 b9324663-ca0f-0410-8574-be9b3887307d