added timezone support to ubuntu preseed. Bug 1155132
https://bugs.launchpad.net/openstack-cisco/+bug/1155132
Merge branch 'master' of https://github.com/michaeltchapman/puppet-cobbler

Conflicts:
	manifests/ubuntu/preseed.pp