Merge pull request #890 from FranciscoBorges/schema

Fix schema, and test (schema) validation of conf files.
https://bugzilla.redhat.com/show_bug.cgi?id=916525 - changing concurrent maps as requested by QA
fixing intermittent test failure
Merge pull request #892 from clebertsuconic/master

small fixes
improving hanging test and tidy up on the Queue API to couple with flush timeout externally
Merge pull request #893 from clebertsuconic/master

changing timeout API and improving tests
Fix typo in method name.