Bug 1073576: Replacing rpcutil usage with openshift agent
 - Also fixing indentation with one method
Merge pull request #5068 from abhgupta/bug_1073576

Merged by openshift-bot