montblanc: storage changes for JB

Change-Id: I30952279b929ee49fd3022a42df95163fd245405
montblanc: include cleanup

Change-Id: I1398e7d93ac7511063971f03a0d712cac5c30070