Fix JMX name for data source
Move and update to match jasig example
Merge remote-tracking branch 'origin/uw-master' into uw-master