Merge branch 'hotfix/2.1.1' into develop
made corrections to equipment_tests_pie procedure

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
made corrections to expected_reporting_devices_pie_expected procedure

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'develop' into feature/db_procedures
Merge branch 'feature/db_procedures' into hotfix/2.1.2
Merge branch 'hotfix/2.1.2'