merging basho/riak_core/bugfix/clique-git-url = 70171d61 into borshop-integration-695-bugfix/clique-git-url