merge of #2880 Update tests to use new ReQL admin API
fix for building on MacOS

over-the-shoulder by @timmaxw