Merge branch 'datastore-detail-fixes' into 'master'

Minor datastore detail fixes



See merge request !392
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud