Merge pull request #353 from xenolog/PR1

sync site.pp between configurations
fix duplicate string
fix duplicate string
FIXes: moving router to alive l3-agent
main Quantum router -- is #1
do not setup router_id if used namespaces