1. cleanly separate deprecated and non-deprecated properties 2. add root disk to inspection data, so that we can have a proper fallback when root device hints are not given. Change-Id: Ie19b82ff2a914873ff4b2395b02643e086b934b1