Halle Berry's ex Olivier Martinez's restraining order dissolved but actor's modified visitation stays, judge rules