Merge "Support importing property file with expanded name" into qt-dev