EAR with 2+ JPA does not shutdown cleanly

EAR with 2+ JPA does not shutdown cleanly.

I see in the logs each JPA project have an entry:

WFLYJPA0011: Stopping Persistence Unit (phase 2 of 2) Service 'blah....jpa.project1'
WFLYJPA0011: Stopping Persistence Unit (phase 2 of 2) Service 'blah....jpa.project2'

then a few lines later:

WFLYJPA0011: Stopping Persistence Unit (phase 1 of 2) Service 'blah....jpa.project2'

I never see the "phase 1 of 2" entry for "jpa.project1" in the log.
The container will wait 300 seconds and timeout.

The management console during the time shows
Operation: undeploy
Execution Status: awaiting-stablility.

The container is killed and the configuration.xml still contains the EAR deployment info, as undeploy did not complete.