trim trailing whitespace on smartos hostname when it came from dmidec…

…ode.

mention new merge format in ChageLog

Create a utility testcase class that fixes some of the 2.6 missing pi…

…eces

- Add a helper testcase class that can add additional features into the
  unit test class as we need for features that are useful to have which
  starts with features that are missing including assertIn and assertNotIn

fix tools/make-dist-tarball

cc_landscape.py: if /etc/landscape does not exist, then create it

make-dist-tarball: make output not be debian-like

instead of cloud-init_0.6.2.orig.tar.gz, create cloud-init-0.6.2.tar.gz

add examples of kernel command line cloud-config

make cloud-init's warning more obviously a warning (prepend WARN)

add 'phone_home' to cloud-config

setup.py: move version to 0.5.15 prior to near release