Merge pull request #1 from ajragusa/master

ISSUE=8216 grant found an issue with the topo init script
Update Database.pm

Updating changes from google code svn.
Merge pull request #2 from gmcnaught/master

Update Database.pm
ISSUE=8216 found a bug with node insertion during 1.1.5 release testing