this is largely to deal with config generator issues, however we're apparently quite far behind on other items, so lets just sync it all. Change-Id: I2f36e41b5d7cce8dd0b64636e45da3f7481b0e39