Fix for Bug NMS-5020

Note: the issue was related with javamail-properties and reportd, but I
was able to verify that reportd doesn't have any problems. But, the
report scheduled configured through the WebUI requires changes. Both are
working fine right now.
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Merge branch 'master' into pull-requests