blocks: address CID 1043279. Remove member d_count (of keep_m_in_n) that wasn't being used.
blocks: address CID 1043280. An unused member (of endian_swap) had the same name as parameter. Removed member.
Merge branch 'maint'
Merge branch 'master' into next