Merge "Add single-package restore to Bmgr feature set"