fix NameError
Add heap storage engine configurations.
Merge heap-configs branch by moving new configs to the right location.
Merge branch 'master' into jenkins
Allow storage engine to be passed to MO setup scripts on Jenkins.