[WFLY-3556] Timer persistence and restore
WFLY-3531 for applications with JPA persistence units, every deployment/subdeployment ends up with the NEXT_PHASE_DEP set up
Merge pull request #6457 from langfr/WFLY-3556

[WFLY-3556] Timer persistence and restore
Merge pull request #6459 from scottmarlow/WFLY-3531_pu_next_phase_deps

WFLY-3531 for applications with JPA persistence units, every deployment/subdeployment ends up with the NEXT_PHASE_DEP set up