Improved scanner modes part2 - more refactors and combined modes#497

syntrust wants to merge 12 commits intomainethstorage/es-node:mainfrom

scanner/hybridethstorage/es-node:scanner/hybridCopy head branch name to clipboard