Merge ""bmgr restore" really should wait until operation finishes." into oc-dev