Update AWS Configuration for ORA1 Problem Creation
Mock the modulestore for the heartbeat tests
Merge pull request #6085 from edx/ammar/update-advance-config

Update AWS Configuration for ORA1 Problem Creation
Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests

Mock the modulestore for the heartbeat tests