Avoid NPE

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Fix results according to 2.5.0 version

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Use DiffMatcher to better see differences while testing upgrade

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Fix UT

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>