Merge "Fixed a couple of runtime issues due to the existing support for the legacy...
-rw-r--r-- 242 .gitignore
drwxr-xr-x - distributions
-rw-r--r-- 2846 pom.xml