MDL-22245 backup - improving subplugin support a bit, thanks to David for his comments