BTE-25 Prettified packages and imports
BTE-25 Updated Scala and assorted dependencies to current versions
BTE-25 Version bump
Merge branch 'BTE-25-upgrade-to-scala210'