Merge pull request #929 from edx/jarv/release-fixes

Jarv/release fixes
updating ami for official release
Merge pull request #930 from edx/jarv/release-ami-update

Jarv/release ami update