Merge branch 'master' into 'master'

use js scheme detection at webmanagement page

Closes #546

See merge request !937
12 jobs for master
in 26 minutes and was queued for 4 seconds
Scheduled