Am I right that all these lines are not related to puppet modules consolidation? If so, make separate pull request for them.