Updating with the latest changes from WildFly upstream master.