Make Soledad wait for EIP before starting (#4885).
Merge remote-tracking branch 'refs/remotes/drebs/feature/4885_make-soledad-wait-for-eip-after-logging-in' into develop