Fixed #1157: Rename when_n/wait_n, add when_xxx_n/wait_xxx_n

Conflicts:
	hpx/lcos/wait_some.hpp
Merge branch 'master' into when_some
Merge branch 'when_some'