including null checks
test
Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard

Conflicts:
	src/main/java/org/hpccsystems/dashboard/api/controller/DashboardApiController.java