Manual Merge of changes to the Solution Deployment Script from 2013.