get dashboard directives updated
Merge branch '2.2' into qa-sprint