cda67b1
Backport patch for ebz#488226 for incorrect content assist colors, fixes rhbz#1253651 and rhbz#1196736 - Fix broken link to mockito in tests