FRR 3 branch by renaming frr to frr4. Fixed a typo regarding my last modification into MOVED file too.