Merging more changes

Changes from litecoinj original 48ea144f60a7194075f1a36d7f15eff1be1bfdcc