Updated to match revised CMake functions.
Merge branch 'vault' into non_anonymous_client