Merge "Make sure APN type ALL does not include types that are not wild cardable" into qt-dev