Pin psutil version to avoid conflicts with gnupg.

gnupg 1.2.5 requires psutil==1.2.1
Merge remote-tracking branch 'refs/remotes/ivan/bug/5309_psutil-version-conflict' into develop