Fix backward compatibility, storage_type/invetory reclass defaults

Change-Id: I8dee93ffd4441391a5b26ba2c5b46e43357a0ca7
3 files changed