Merge remote-tracking branch 'kali/fix/fix_soledad_boostrap' into develop

Conflicts:
	src/leap/services/soledad/soledadbootstrapper.py
add imap service
comment out common service initialization
catch errors during soledad initialization
reindent for clarity
start imap service
Properly shutdown soledad instance.
changes file