OAK-6392: Partial lastRev update with branches disabled Merge revision 1799861 from trunk and enable test