Fixes locking of labels
CDB-1122 #fixes Don't update the legend if we modified properties from the wizard that aren't related. If the user selected the custom wizard, don't change the legend if she chnages the wizard
Fixes lock in intesity legends
merged CDB-1122
fixed merge problems