Fix issues in add/delete router interface.

Change-Id: Ie1f1a618824c87a2ba7787fdd3d5e7241bb870ff
adding floating-ip-fixed-ip-address

Change-Id: If4f7c78316cbc12ac8d2985474f9379bef5badba
Fixes from tempest tests run

Change-Id: I903e986533e9f6f807840c5ef25191d1aec82c50
Merge branch 'master' into aap_code