Merge "Add test for OS::Neutron::Router Heat resource"