Merge changes for spring boot 2.1.2 upgrade
+other quality of life updates (minor a they may be)
#127 (closed)