Merge "Remove Maven build" into stable-2.16