Merge sitelinks/badges to sitelinks (api props)

Badges are part of sitelinks and should be returned
always.

The only exception is sitelinks/removed. If it's
set, badges are omitted as they are redundant then.

Some whitespace fixes included.

Change-Id: Ib35985655767422d40c5fbf37ecbfc40cd661958
Merge "Merge sitelinks/badges to sitelinks (api props)"