Only remove user-defined bookmarks if selection fails
Disable call to CM10 StorageManager.getVolumeList()

This causes the fallback of using mount points,
which works properly.
Merge branch dev-issue56