Fix pb_security failures

WIP do not merge, see [RIAK-1429](https://bashoeng.atlassian.net/browse/RIAK-1429) for commentary.