Merging with upstream changes
Merging with upstream changes

Merging the changes pulled from upstream to resolve the conflict on package.json
Jira issue: WP-836

webinos/Webinos-Platform,webinos/Webinos-Platform,krishnabangalore/Webinos-Platform,krishnabangalore/Webinos-Platform,krishnabangalore/Webinos-Platform,webinos/Webinos-Platform,webinos/Webinos-Platform,webinos/Webinos-Platform,krishnabangalore/Webinos-Platform,krishnabangalore/Webinos-Platform,krishnabangalore/Webinos-Platform,webinos/Webinos-Platform,webinos/Webinos-Platform,krishnabangalore/Webinos-Platform,webinos/Webinos-Platform,krishnabangalore/Webinos-Platform,webinos/Webinos-Platform,krishnabangalore/Webinos-Platform