Automatic merge from submit-queue

Allow specifying base location for test etcd data

Allows controlling where etcd test data goes. Needed in some environments (like AWS/EBS) to allow putting etcd data on a higher performing volume than /tmp