Merge pull request #1051 from puppetlabs/maint-move_apt_mark_to_provider