Merge conflicts were resolved in similar fashion as followed for V6.3-003 merge.
The only notable conflict of mention is sr_port/gtm_libaio.h which had a better
fix already in the YottaDB mainline. The YottaDB fix would work even if
structure changes in future linux versions. Therefore the V6.3-003A
change to sr_port/gtm_libaio.h was discarded.
Merge conflicts were resolved in similar fashion as followed for V6.3-003 merge.
The only notable conflict of mention is sr_port/gtm_libaio.h which had a better fix already in the YottaDB mainline. The YottaDB fix would work even if