Merge branch 'ojs-stable-2_4' of git://github.com/pkp/pkp-lib into HEAD

Conflicts:
	classes/session/SessionManager.inc.php
	xml/schema/common.xml