UAVObjectUtilManager metadata handling fixes and calibration refactoring

Should supersede #1302  
Don't forget to drop this method.  I saw you hit the other issue.