Merge branch 'lohenry-charm-20152016newSettings' into 'run2-patches'
New charm settings for 24r2 and 28r2
See merge request !1329 (merged)
(cherry picked from commit be2f5c85)
3bb69071 Edited settings to propagate 1327 and 1328
New charm settings for 24r2 and 28r2
See merge request !1329 (merged)
(cherry picked from commit be2f5c85)
3bb69071 Edited settings to propagate 1327 and 1328