Updated dependencies and cleaned up pom.xml
Cleaned up pom.xml
Cleaned up pom.xml
Cleaned up pom.xml
Updated pom.xml
Merge commit 'a65fc535c3b778450b576c322668af09d1a50604'

Merged changes from upstream.
Merge commit 'f8d76114c701fede58bd30b112ccfe7fd6421f0a'

Merged changes from upstream.
Merge commit '6b3721d3eb7d86291afb08c82ab52b4b81fb2d30'

Merged changes from upstream.
Merge commit '82b27798e781d1be687caae79d632381ccda5a38'

Merged changes from upstream.