Change service{} declarations to depend on Class['docker'], since that's less brittle
Fix "Warning: '-cidfile' is deprecated" messages