Merge pull request #446 from adam-vessey/7.x-FLVC-30

Avoid adding on duplicate extensions.
Fix warning when the datastream label was shorter than the extension.