Merge pull request #2637 from nfedera/fix-shadow_client_context_cleanup
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 21 May 2015 14:21:09 +0000 (16:21 +0200)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 21 May 2015 14:21:09 +0000 (16:21 +0200)
shadow/client context cleanup and unused vars fix


Trivial merge