svn merge -r15808:15810 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

src/common/slurm_accounting_storage.c

@@ -1854,6 +1854,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
 	*object = object_ptr;
 
 	init_acct_association_rec(object_ptr);
+
 	if (rpc_version >= 4) {
 		safe_unpack32(&count, buffer);
 		if(count != NO_VAL) {

src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c

@@ -1138,6 +1138,7 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
 	char *block_id = NULL;
 	char *query = NULL;
 	int reinit = 0;
+	char *wckey = NULL;
 
 	if (!job_ptr->details || !job_ptr->details->submit_time) {
 		error("jobacct_storage_p_job_start: "