Added partial stack trace to unexpected exception responses to help with web-api debugging. Fixed a bug in EndTransaction.

In TransactionEnd, when it does a merge commit there was the possibility for it to result in conflicts thus leaving the repo in a conflicted state. To fix this we use the their's strategy as a temporary solution.
Merge branch 'TransactionEndFix' into SprintInProgress