merge for tickets update 14

https://github.com/restlet/restlet-marketing/issues/171
https://github.com/restlet/restlet-marketing/issues/170
https://github.com/restlet/restlet-marketing/issues/168