Increase packet size for "timedout" test in box/socket.test, Bug#1192951
Merge branch 'stable'

Conflicts:
	third_party/luajit