WFLY-2057 backport to resolve issue with hanging start-up.