Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)

Conflicts:
	CHANGELOG
raoulbhatia: Custom changes