Add GA related parameters to trove-taskmanager.conf.sample

Adds placeholders for 'guest_config' and 'cloudinit_location'
to trove-taskmanager.conf.sample

Fixes bug: 1237395

Change-Id: I5214f5fcc785d94b5b2b60dead316768980d7909
Replace deprecated method aliases in tests

Some of the TestCase methods have been deprecated since python 2.7.
We need use correct names.

http://docs.python.org/2/library/unittest.html#deprecated-aliases

* replace 'assertEquals' with 'assertEqual'
* replace 'failUnlessAlmostEqual' with 'assertAlmostEqual'

Change-Id: I90da87723e3e36767946d276301b75af801b952d
Merge "Add GA related parameters to trove-taskmanager.conf.sample"
Merge "Replace deprecated method aliases in tests"