Oriole closer Jim Johnson back in groove after disastrous May