Jbide 15494 4.1.x

apply Mylyn's fix to our forked Discovery strategy