[FLINK-1292] Allow for longer normalized keys when using composite keys

This closes #241