Make sure parent folder selector always contains parent folder
of current folder, even if it does not exist
Fix fatal error in database_attachments plugin under some conditions (#1489726)

Conflicts:

	CHANGELOG