#456 - outputting compact tenant object, checking number of keys in tenant object.
Merged master.
Merged master.
Merge branch 'issue-465' of git://github.com/simong/Hilary into issue-465