Merge "Bug 1100 - Invoking an RPC with no input should not throw 500 when expected"