Fix issue with concatination of scalars. needed to be a list
Fix issue with concatination of scalars. needed to be a list


Former-commit-id: 1a17e8bfdb74ddf97d1e4091df457722026a7d6e [formerly e166201327803cc8217dca4cf8c2f4368aff223e] [formerly c2c0b39a96b8dc684c3721727c1fae1b42afcbf9 [formerly 732d3b5106a2649328d48c7456e778809264c7a9]]
Former-commit-id: 034fd3de0c332b3d3b9f3d01f44cb52cf1713c9e [formerly 43c79ace622715bc8060d7109ce2e2fb02f823d5]
Former-commit-id: 7d25fa8a1f53b06c56d6f3af9e20900969e3d945
jason-neal/eniric,jason-neal/eniric