Merge branch 'gi129' into 1.7.x
Allow turning off of resource minification through JMX MBean
Merge pull request #139 from kevinoriordan/1.7.x

Allow turning off of resource minification through JMX MBean
rename flag to minimizeEnabled
fix merge conflicts