Merge proposals dependent on lp://staging/~allenap/launchpad/remove-xmlrpclib-marshalling-bug-254999

1. remove-xmlrpclib-marshalling-bug-254999
2. Dependent merge proposals