CSPACE-6278: Separate clean from install of Services layer. More tweaks to resource ordering.