Merge "Bug 2684 - Fixing support for Neutron binding extended attributes"