Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

Closes #38

See merge request !239

(cherry picked from commit 0497d7a4)

b77f4e57 Squashed commit of the following 
3574d19c Merge remote-tracking branch 'origin/master' into dev
3cd5c5c3 Merge remote-tracking branch 'origin/master' into...
8a61c705 Merge remote-tracking branch 'origin/master' into dev
9b9dff42 Merge remote-tracking branch 'origin/master' into...
7e767948 Update os-core-lib-aws version to 0.14.0-rc2
87dc64a1 Merge from master to dev
bfb02472 Merge branch 'master' into master-dev-merge
b56468e0 Merge branch 'master' into master-dev-merge
6ba21deb Merge branch 'master' into master-dev-merge
0d1999d6 Merge branch 'master' into master-dev-merge
3f3db46a Squashed commit of the following:
bb36944d Merge remote-tracking branch 'origin/master' into...
6653a353 Merge branch 'master' into master-dev-merge
ce3d4649 Squashed commit of the following