Consolidate core units

Summary:
Currnt Nasqueron Best practice is to list roles in top.sls,
and individual units in the role's init file.

Test Plan: salt '*' state.apply roles/core test=True

Reviewers: dereckson

Reviewed By: dereckson

Differential Revision: https://devcentral.nasqueron.org/D1373