Better support of the simple features profile

Replace parts that not part of the:
Geography Markup Language (GML) simple features profile
Version 1.0
http://portal.opengeospatial.org/files/?artifact_id=15201&passcode=h597f3yybeu8fqxh99kh

fix  #4977 and  #4924