Feature #3167: Make the restricted attributes apply only to reservations

(cherry picked from commit 58810f41eee1160ebcd80c2369b2788d63054c24)