Merge proposals dependent on lp://qastaging/~timo-jyrinki/compiz-core/blacklist_remove_double_escape_from_xml2-0.9.7

1. blacklist_remove_double_escape_from_xml2-0.9.7
2. Dependent merge proposals