Fixes the unit tests in a slightly nicer way - by fixing the singleton and
making the unit_name a property instead.
Lint fix
Merge lp:~tribaal/charms/trusty/landscape-client/fix-unit-tests-take-two [r=free, sparkiegeek]