Merge "Add settings to configure default multipath quota." into pi-dev