Merge "Add xml support to the floating ip and router"