merge master into log_stats_tracking

i want this stuff.
@ksonney I don't really know if we should be doing it this way, I think maybe we should just fix the one in the core ubersystem instead and have it so puppet overrides the stuff there?  this one I think will definitely break our stuff right now.  

I do want to keep extracting this stuff piece by piece though.

Could you wrap this in a 'replace_development_defaults_ini' paramater that is disable by default and then enable that just in AC for now?