Merge pull request #2141 from mboersma/update-psycopg

chore(controller): update psycopg to 2.5.4

Author: mboersma

requirements.txt

@@ -12,7 +12,7 @@ djangorestframework==2.3.14
 docker-py==0.4.0
 gunicorn==19.1.1
 paramiko==1.14.1
-psycopg2==2.5.2
+psycopg2==2.5.4
 python-etcd==0.3.0
 PyYAML==3.11
 redis==2.9.1