Merge pull request #226 from sgtcoolguy/APSTUD-8264

APSTUD-8264 After upgrade to 3.6 switching workspaces requires forcequit