Correct url creation for xmlrpc. Fix lock order with voucher expire. Bring from master fixes for exec_php xmlrpc code generation