Adjust permissions on collector configs
Fix diamond service definition

Diamond fails to start when the diamond.conf does not exist, which
prevents chef from creating the diamond.conf. We should delay the
diamond restarts / enable until the end of the run.