EUCA-9963 - making property setting idempotent for blockstoragemanager
Merge branch 'dev/wwannemacher/EUCA-9963-2' into testing