SI-6654 & SI-7005 - Map#filterKeys and Map#mapValues not serializable

Fixes SI-6654
Fixes SI-7005
Merge branch 'SI-6654-SI-7005' of github.com:sullivan-/scala into SI-6654-SI-7005

Conflicts:
	test/files/run/map-methods-serializable.scala