11139: Merge branch 'master' into 11139-nodemanager-mem-scale-factor
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 7 Mar 2017 17:54:22 +0000 (14:54 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 7 Mar 2017 17:54:22 +0000 (14:54 -0300)

Trivial merge