Revert "Remove unnecessary return in Siteinfo._get_general"

This reverts commit c6e92cacbcdd56ab10810be9c36d3d18deebe7ef.

Change-Id: I1b15978dc279e3e3ce8b49101a9aa757378c3f79
Merge "Revert "Remove unnecessary return in Siteinfo._get_general""