Merge "backuptool: Add an option to ensure running." into gingerbread