Merge pull request #24 from ua-eas/fix_deploy

Fix deploy
Merge branch 'KATTS-2473' into staging
KATTS-2035 merging staging into master for eventual PRD migration
Merge branch 'master' into development