fixed layer updating when editing info window data fixes #277 CDB-1018
Merge remote-tracking branch 'origin/bug/CDB-1018' into release/2.5.1