Merging latest Keyring changes from Beau into our fork of Keyring

I think it's a good idea to keep using our fork though since the nature of some of the changes that might happen in the future could break things for us.  In fact I believe this one will break one aspect of our credentials filter which was anticipating the difference in implementation for the keyring_credentials filter when used inside or outside of a service.  It's a simple fix thankfully.

https://github.com/GigaOM/gigaom/issues/4162