Move paverlib server.py back to master.