Fixed several issues
Fixed comments
Merge pull request #1463 from ray176/VersionableDatabaseObject_2

VersionableDatabaseObjects - again