merged changes from secondmarket-cookbooks-standalone-service-name