Merge "Fix compilation error due to missing getopt with x86_64-linux-glibc2.11-4.8" into idea133