Merge pull request #5 from HavretGC/solution_cleanup

AMQNET-586: NMS AMQP Solution cleanup