Add back the custom timeouts for some RPC calls

Fixes OS-121

A merge from stable/diablo seemed to remove the custom timeouts
on the RPC calls. This brings back that functionality.

Change-Id: I33e16363874a42d86df8608bfdec02cabecdca10