Revert cherry-pick for soledad imports

...because we're not releasing the newest soledad version yet
(secrets module will appear with soledad 0.6.0)
remove dict comprenhension
add syntax error fix to changelog