CRM-14275 Patch 44 Branch with report fix

Including patch that was put through to master as the issue is still there in 4.4.5