Bug 3158/dev/remove limitaton on report key

Fix for http://www.rudder-project.org/redmine/issues/3158, to replace PR #26 which was missing initial promises.