Fixes the traceback when specifying raid_devices in raid.present
Removing raid_devices option as it's no longer needed
Removing variables not needed. replacing values directly
Backport #14396 to 2014.7
Merge branch '2014.7' into develop