* patch QSI exception * fuck don't die (cherry picked from commit 9a795b35adba4575f2674f937f8b4bb566b3cb15)
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components. (cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
(cherry picked from commit fdd18c9ae49cf98a766b5df484c67d9cf4f4418e)