PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
PHOENIX-1474 NPE when RVC between combined with key part comparison