Merge "Added AccessPoint.matches(AccessPoint) method to match AP objects" into qt-dev