Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
Added possibility to register flag mappings by a plugin.

Conflicts:

	plugins/markasjunk/markasjunk.php
	program/lib/Roundcube/rcube_imap_generic.php