Fixing bad push/conflict created by trying to commit from test runner system
Fixing bad push/conflict created by trying to commit from test runner system

KrisShannon/sdc-cloudapi,joyent/sdc-cloudapi,KrisShannon/sdc-cloudapi,joyent/sdc-cloudapi,misterbisson/sdc-cloudapi,misterbisson/sdc-cloudapi,arekinath/sdc-cloudapi,arekinath/sdc-cloudapi