Primary key of cwd_application_address is not added during upgrade

Steps to Reproduce:

1. Install a version of Confluence earlier than 5 (e.g. 4.3.7)
2. Verify that the schema is as follows:

   CREATE TABLE cwd_application_address
   (
     application_id bigint NOT NULL,
     remote_address character varying(255) NOT NULL,
     remote_address_binary character varying(255),
     remote_address_mask integer NOT NULL,
     CONSTRAINT fk_application_address FOREIGN KEY (application_id)
         REFERENCES cwd_application (id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION
   )

3. Upgrade this instance to latest
4. Verify that the schema hasn't changed:

   CREATE TABLE cwd_application_address
   (
     application_id bigint NOT NULL,
     remote_address character varying(255) NOT NULL,
     remote_address_binary character varying(255),
     remote_address_mask integer NOT NULL,
     CONSTRAINT fk_application_address FOREIGN KEY (application_id)
         REFERENCES cwd_application (id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION
   )

5. Install a fresh copy of latest
6. Verify the schema includes a primary key:

   CREATE TABLE cwd_application_address
   (
     application_id bigint NOT NULL,
     remote_address character varying(255) NOT NULL,
     CONSTRAINT cwd_application_address_pkey PRIMARY KEY (application_id, remote_address),
     CONSTRAINT fk_application_address FOREIGN KEY (application_id)
         REFERENCES cwd_application (id) MATCH SIMPLE
         ON UPDATE NO ACTION ON DELETE NO ACTION
   )