[BACKLOG-248][CLEANUP]
	- logging is better organized;
	- also added additional logging, covering more of the code
	- fixed javadoc tag ( from "@see <link>" to "@link <link>" )
Merge pull request #688 from pedrofvteixeira/monitoring

[BACKLOG-248][CLEANUP]