Merge pull request #5064 from jreback/ix_edge

BUG: Bug in setting with ix/loc and a mixed int/string index (GH4544)
BUG: Make sure series-series boolean comparions are label based (GH4947)
ENH: Series lhs, scalar rhs bool comparison support