Merge branch 'release/2.1.0' into develop
Remove m2e warnings, also fix whitespace.
Fix XML warnings in Eclipse.
Fix an issue with the querying of the view.
Prepare for release 2.1.1.
Fix white-space.
Merge branch 'release/2.1.1'