Add satellites timeout option.
Merge branch 'satellites_timeout' into 'master'

Satellites timeout option

Fixes #226

See merge request !194
LDAP sync_time option.
Merge branch 'ldap_sync_time_option' into 'master'

Ldap sync time option

Fixes #227

See merge request !195
Log `rake db:migrate` output in /tmp
Merge branch 'db_migrate_progress' into 'master'

Log `rake db:migrate` output in /tmp

See merge request !196