InheritFrom and InheritanceType implementation for Database Adaptor
match up making and parsing doc-ids
Merge branch 'master' of https://github.com/googlegsa/database
change escpae char from \ to _
make it easier to play with decoded data
Revert "InheritFrom and InheritanceType implementation for Database Adaptor"

This reverts commit 348843ddea8b2f919a22205f0b83d830dba754f1.

Will put this commit back after cutting another
4.0.4 release-candidate