Bug 7731 [Follow-up] Library should be used instead of branch and site