replace contains(x,y) with in(y,x). closes #4153

also add contains(String,String) to test for substrings