Merge "Enable gerrit image build for 2.14.6 version"