PY-13993 "settings.py" can't be found if website name differs from project folder name
(TODO: Add tests)
Merge remote-tracking branch 'origin/master'
cosmetic & cleanup