Fix a couple typos

Change-Id: I9d63e9b52162dfccd72488655f61842e7723718f
Make internal client work with conf.d

Copied from Clay's patch in LP

Fixes bug #1277046

Change-Id: I2052ffaea3a74cdca9596b08273b7120570b1375
Merge "Fix a couple typos"
Merge "Make internal client work with conf.d"