Pull request for 20141015 Deployment

Various errors and an early deployment of some UAT features lead to problems.  This is a deployment that addresses all outstanding issues.