Dell consolidates, plans unified software and all-flash arrays