Merge v1_1's BootingManagerWithFind into base
Add new parameters for block device mappings v2