Remove custom Shorewall repo for now
Merge branch 'master' into next

Conflicts:
	modules/shorewall/manifests/init.pp