changes to storage handling for clone (incomplete)

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>