Merge branch 'stable-3.7' into stable-3.8

* stable-3.7:
  Allow specify either avgKeySize or avgValueSize as command parameters
  Fix avg value and key size calculation when auto-adjusting caches
  Apply Flogger fixes from  Ia4e5a3c513

Change-Id: I8be781677dca2b4391ef8cd83c52e3321cd4947a