TEIID-2444: adding changes related to XML based deployment