Graphite: added more optional parameters to aliasByNode function definition, #1124
Merge remote-tracking branch 'upstream/master'