WFLY-3147 Property replacement in beans.xml causes NPE
Merge pull request #6076 from stuartwdouglas/WFLY-3147

WFLY-3147 Property replacement in beans.xml causes NPE