Merge changes I4edd999d,I6dab5be8
am: d9877d97c0

* commit 'd9877d97c07e5c33132f6227044f795bd5f9df05':
  Fix several tests that were worded incorrectly
  Allow separation of path and certs