re-enable the raid check
ignore the war file
merge
add vdisk alias
add kview alias
merge from master