Merge "Update version of apn configuration files to version 7"