Handle PostgreSQL 9.4
Merge branch 'Branch_5_3'
Better handling of Selenium timeout
Merge branch 'Branch_5_3'
Better handling of Selenium timeout
Merge branch 'Branch_5_3'
fix php warning
FRS: display public status correctly. remove edition from FRS, use RBAC
manage-apache-config.sh: fix bug introduced by un-hardcoding paths
Merge branch 'Branch_5_3'