Merge pillar + mine data for remote input plugins

This is needed to enable additional plugins (such as http_listener)
from the user/system model.

Change-Id: Ibd647e855e38a492a0de2b8ead6df755e99fe921
1 file changed