Add test for unambiguous call to swap (refs trac #10882)