Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev