MDL-14589 file api improvements - converting more params to general $options array