Merge branches 'ivas-float-update' and '1632_ref_port_fl1497' of...

Merge branches 'ivas-float-update' and '1632_ref_port_fl1497' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1632_ref_port_fl1497