Merge "Updated chapter 7.3 Configuration management"