Separate satellite configuration from the rest

Change-Id: I88bc212edb07dc9860e2d8c9bf6b4d41d92ade20
Fixes: rhbz#905368
Merge "Separate satellite configuration from the rest"