Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined
Merge pull request #14657 from mcjimenez/bug949315_v1.2

(v1.2) Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined