Pull request to reconcile ITHSDO:develop branch

These are all of the changes on the path since what develop branch was created from.  This builds in development environment and on the prod machine.  There will be one more round of changes related to the 201405 SoW.