merge from 2.2 (deleteprinterdriver RPC)