Merge branch '2.7.x'

• 2.7.x: (21 commits) (#7296) Make the Debian service provider handle services that don't conform to the debain policy manual. (#4836) - Agent --disable should allow to put a message (#3757) - Refactor enable/disable to its own module (#3757) - Move enable/disable to its own lock Fix failing tests with ruby 1.9.2 in the instrumentation framework Use all lower-case file name for Puppet::Util::Instrumentation::Instrumentable Maint: Fix typo in usage example for create_resources function Set of faces to manage instrumentation listeners, data and probes Example probes for the indirector Add probe indirection for probe management Process name instrumentation listener Add the 'performance' instrumentation listener Add the example 'log' listener Add a way to add probe to puppet code Add indirection (REST usable) to manipulate instrumentation Instrumentation foundation layer (#8119) Write reports to a temporary file and move them into place (#11414) Test Augeas versions correctly with versioncmp (#11414) Save/execute changes on versions of Augeas < 0.3.6 Updated CHANGELOG for 2.6.13 ...

Conflicts:
spec/unit/application/agent_spec.rb
spec/unit/provider/augeas/augeas_spec.rb