Merge "Test for rejection of ftp URL with /r/n in userinfo" into nyc-dev am: da857581 am: 4ee45da1 am: e873a6a4 Change-Id: I7650b0683212e26171044d82e19f62de717b92e4