Merge pull request #26 from saforem2/fix/tunnel-credentials-uuid