Remove unnecessary return in Siteinfo._get_general

Siteinfo._get_general has a return at the end of the 'force'
branch, which is not necessary as the next lines repeat the same
logic in a more generic way.  Removing this return simplifies the
flow of the method.

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