os: do not attempt to detect discard by default

If the journal_discard option is false, the journal should no try to
guess if the device has discard capabilities.

http://tracker.ceph.com/issues/10296 Refs: #10296

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 9c5fd8c20a5ef7b7c3b7da1d39a86c2abd6e952e)
tests: do not ignore ceph-disk.sh::test_activate_dev failure

The status of the test commands must be tested instead of being
silently ignored.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 2ad55cd601d57003d9ac169c9574b589612368e4)