Restore overlaid adoptee.js duplicate checking
Merge branch 'master' of http://github.com/nxidis/topekacb
Fix overlaid adoptee duplicate code