Improve ServiceCache behavior with duplicate service instances.
Merge remote-tracking branch 'mark/servicecache-bugfixes'
Few updates to @ohhatiya's take on ServiceCache bugfixes
Merge remote-tracking branch 'origin/master' into servicecache-bugfixes
Merge remote-tracking branch 'mark/servicecache-bugfixes'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/ssmith-guava'
Merge branch 'master' of github.com:bbeck/ostrich