Updated from global requirements

Change-Id: Ibdbdae16eb5b15cdfa5ca194dc852abfde14f74d
Handle bool correctly during _extend_extra_router_dict

Ensure that extension attributes are always used to
override the chosen defaults. This was not working
in the case of default boolean True, as the testing
condition was wrong.

Closes-bug: #1348479

Change-Id: I22bce82c6078a96c0eb4a67e6decb6e9205721a8
Merge "Updated from global requirements"