add 7u60 and make default
Merge branch '7u60' into all-fixes

Conflicts:
	manifests/init.pp