Refactor Upgrade => Condition[Level], ...

Closes #7047
I think it would be better to drop the `Level` from most of these method names.  To me, `GrantConditionLevel` implies that there should be an integer parameter specifying the level to grant.   This would also improve consistency with `GrantTimedCondition` below.