OPENUCB-217: Update features-7.x-2.0 and add features_override-7.x-2.0-rc1