updating base ami, including ora
Merge pull request #959 from edx/jarv/update-ami

updating base ami, including ora
Merge pull request #960 from edx/release

Release