Fixed bugs in rmman and catman
Merging from pull