[AE-922] applying -Phive-0.13.1, and 0.13.1a from the community to include compatible APIs from spark