Merge pull request #651 from nhinds/MODULES-4265-ubuntu-security-updates