|#474|+Manan,Anshul| Refactoring approve rnr controller. Using only one grid,fixing functional tests,