Merge "Fix bug 2449 in sal-remoterpc-connector Regarding to Moiz's comments, replace...