Merge "Create gre net04 and non HA router"