REFACTOR entitiesQuery() code to make it clearer and improving documentation (fix a P2 FIXME)
REMOVE references to issue old 33
CHANGE references to old issue 90 to 371
ADD python-jinja2 dependency to contextBroker-test RPM package
FIX typo in comment
Merge pull request #374 from telefonicaid/hardening/query_logic_refactoring

Query logic refactoring and some other minor fixes