Release 205 plus owen layout

* DO NOT MERGE *

Feel free to review it though!  

These are the application repo changes to support the new apache config layout, merged from dev.   We will also be doing extensive testing today in preparation for rolling this out asap.