Bringing up to date with latest from Unidata.

This includes the contents of my IDV pull request that fixes the side
legend preference.

[804]