2021-February-22 - Prerelease - 2.6.22@dbde499ccc

Various fixes to infrastructure group var override config

1. Fix maps_server version always being overriden
2. Inline most group_vars into inventory (simplify/reduce number of files)
3. Clean up unused variables