add newly annotation entities to disk usage count

arising from https://github.com/openmicroscopy/openmicroscopy/pull/2412
include pyramid lock files in disk usage calculation
Add getter and setter methods for _event_context in CLI

Also fix the corresponding integration tests
Add getter and setter methods for _client in CLI
Add special handling for zero value in HqlControl.filter()

This commit should allow zero-values not to be filtered out when returning
the output of a query.
Add unit tests for HqlControl.filter()
Merge pull request #3110 from mtbc/trac-12552-disk-usage-for-extra-annotations

fix #12552: include extra annotations in disk usage calculation
Merge pull request #3116 from sbesson/12572_hql_zerovalue

Handle zero value in CLI hql
Merge pull request #3114 from sbesson/12388_getter

CLI: add getter/setters for client/event context