Bug 1073576: Replacing rpcutil usage with openshift agent
 - Also fixing indentation with one method