sync RMF to 1bd140b619328152978618a3a34e6d56c489a3a2

git-svn-id: https://svn.salilab.org/imp/trunk@17283 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
sync RMF to 4c426293195d4db228d7f8587e597325f56950a3

git-svn-id: https://svn.salilab.org/imp/trunk@17284 e91f8c7b-0e32-4433-a9ac-4502d39a4eab