Implement suggestions.

Also better error handling on update config script.

Change-Id: I963053495415bc8f2f50be12e9730ccf575fff77
Rename scripts to be generic.

Change-Id: I2402ff069e0e1308352c150d2ac07f3c0d4e6fac