Merge pull request #2089 from dennishendriksen/master

Revert EntityMetaData.getAttribute changes