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