Merge branch 'issue757' into 1.7.x
move check for minimizeEnabled flag to DefaultCacheKeyFactory to ensure that change of minimize flag is applied immediately.
fix merge conflicts