Merge pull request #55 from teiid/2.0.x

Merge pull request #54 from teiid/master
update to bom13
Merge pull request #59 from vhalbert/bom13

update to bom13
Merge pull request #60 from teiid/master

Backport to 2.0.x branch