Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
merge from 3.3

Improve the docstring of random.shuffle. Inform users not to provide int arg.
Addresses issue #14927
Automated merge with ssh://hg.python.org/cpython
Removing the merge conflict markers.

- my previous removal and hg resolve mark had still left them and hooks did not catch it too!