Correctly merge environment attributes with json attributes#17

tcnh merged 2 commits into

mainorangebeard-io/javascript-client:mainfrom

attr_from_envorangebeard-io/javascript-client:attr_from_envCopy head branch name to clipboard