ansible/ansible — pull request #7393 by jimi-c (2014-05-14 06:46:31+00:00)
Title: Properly merge role conditionals in with pre-existing conditionals

Fixes #7387