Various config changes for s1 test boxes (db107[23])

Change-Id: I601975e294370b8dd430ba250a70e248fe82f37b