Address control has 2 methods to get same metric

getNumberOfMessages() and getMessageCount() both return the same metric albeit in different ways. This is confusing and should be refactored.

Also, getNumberOfMessages() inspects both "local" and "remote" queue bindings which is wrong. This can result in differences between the values reported by each.