[Review Queue] kibana & nagios tests (follow-up)

[Cory Johns]

Following up on previous reviews, I took a look at test additions by
nicopace to both the kibana and nagios charms.  Both had some minor
issues causing failures, but I created secondary MPs with suggested
fixes to help get these reviews finalized.

https://code.launchpad.net/~nicopace/charms/trusty/kibana/all-tests/+merge/251309
https://code.launchpad.net/~nicopace/charms/trusty/nagios/all-tests/+merge/251286