https://www.pivotaltracker.com/story/show/48342359
https://www.pivotaltracker.com/story/show/48342417 in progress
https://www.pivotaltracker.com/story/show/48342417
Merge branch 'dev_delete_subdomain_arch_48342359' into develop