Fixed the issue with null value
Merge branch 'develop' of github.com:wso2-dev/product-emm into develop

Conflicts:
	modules/apps/emm/client/js/devices/management.js