Merge "BUG-2383 : fixed various small bugs in end-to-end RIB integration"