Update deprecated methods based on jgoodies updates
Formatting
Merge remote-tracking branch 'UMS/PMS' into Panasonic_subs