Fixup merge commit 813a3b5de5
Fixup merge commit 813a3b5de5

Change-Id: If5634b8c7360176e2a77d95ff39598eee4953108
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/9803
Integration-Tests: Jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <35c9282df89348b7fc05004596f290fd320920c1@gmail.com>
Tested-by: Michael Blow <3f64e033f015f10d416a166dcd735dbc31e7ff2a@apache.org>

apache/incubator-asterixdb,apache/incubator-asterixdb,apache/incubator-asterixdb,apache/incubator-asterixdb,apache/incubator-asterixdb,apache/incubator-asterixdb,apache/incubator-asterixdb