Merge "Bug 1505 - Provide test coverage for binding-data-codec using sal-test-model"