Task #8887: Various minor fixes

SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt

 # $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
 
 lofar_add_bin_scripts(addtoQPIDDB.py
-                      cep4_config.sh
+                      populateDB.sh
                       compareQPIDwithDB.py
                       configQPIDfromDB.py
                       gatherfrombrokers.sh

SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py

@@ -20,6 +20,7 @@ if __name__ == '__main__':
 
     if (len(sys.argv)<2):
 	 parser.print_help()
+	 sys.exit(0)
 
     dbcreds = dbcredentials.parse_options(options)
     QPIDinfra = qpidinfra(dbcreds)

SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py

@@ -28,7 +28,7 @@ class psqlQPIDDB:
         if self.conn and self.conn.status==1:
 	    return
 
-	self.conn = pg.connect(**self.dbcreds.pg_connect_options())
+	self.conn = pg.connect(**self.dbcreds.psycopg2_connect_options())
 
 	if self.conn and self.conn.status==1:
 	    return