Polish
Protect against duplicate datasource MBeans

See gh-1590