Merge branch 'aws-integration' into 'master'

jackson version update

See merge request !288

(cherry picked from commit ec293a18)

5a661fd4 Squashed commit of the following:
c791ef79 Update NOTICE