Merge pull request #5704 from jreback/loc_astype

BUG: loc assignment with astype buggy, (GH5702)
BUG: Bug in fillna with Series and a passed series/dict (GH5703)