Branch b1_6

After an unnecessary block in osts for waiting in-flight quota request is
deleted, a few places should be fixed in order to work with it.
b=14783
i=johann
i=andrew.perepechko