Merge branch 'fix_amqp_connection_error' into 'onem2m-test'

Fix amqp connection error & some new features

See merge request !3