When approving any matter listed in Section 558, the City Planning Commission and the Council shall make findings showing that the action is in substantial conformance with the purposes, intent and provisions of the General Plan. If the Council does not adopt the City Planning Commission’s findings and recommendations, the Council shall make its own findings.