[FIXED JENKINS-23179] git pre-merge fails with matrix project

Created a unit test that reproduces the failure observed in JENKINS-23179. 
Created a solution to the problem by forcing use of the marked revision rather than the decorated revision.