feature #1664: Fix trim and wrong extended template updatey
feature #1664: Fix trim and wrong extended template updatey

fasrc/one,juanmont/one,juanmont/one,atodorov-storpool/one,dberzano/opennebula-torino,dberzano/opennebula-torino,OpenNebula/one,goberle/one,unistra/one,cloudweavers/one,alvarosimon/one,ggalancs/one,tuxmea/one,mattthias/one,atodorov-storpool/one,ggalancs/one,alvarosimon/one,unistra/one,alvarosimon/one,fasrc/one,alvarosimon/one,tuxmea/one,dberzano/opennebula-torino,baby-gnu/one,Terradue/one,unistra/one,unistra/one,goberle/one,tuxmea/one,OpenNebula/one,spirit03/one,Terradue/one,tuxmea/one,fasrc/one,cloudweavers/one,ohamada/one,goberle/one,Terradue/one,OpenNebula/one,goberle/one,goberle/one,mattthias/one,baby-gnu/one,Terradue/one,dberzano/opennebula-torino,goberle/one,OpenNebula/one,baby-gnu/one,ohamada/one,abelCoronado93/one,unistra/one,mattthias/one,fasrc/one,abelCoronado93/one,baby-gnu/one,atodorov-storpool/one,atodorov-storpool/one,unistra/one,hsanjuan/one,cloudweavers/one,juanmont/one,ohamada/one,hsanjuan/one,dberzano/opennebula-torino,baby-gnu/one,OpenNebula/one,hsanjuan/one,OpenNebula/one,Terradue/one,goberle/one,mattthias/one,OpenNebula/one,ohamada/one,ggalancs/one,hsanjuan/one,juanmont/one,baby-gnu/one,Terradue/one,dberzano/opennebula-torino,Terradue/one,atodorov-storpool/one,mattthias/one,juanmont/one,fasrc/one,unistra/one,atodorov-storpool/one,cloudweavers/one,spirit03/one,cloudweavers/one,fasrc/one,atodorov-storpool/one,unistra/one,juanmont/one,ohamada/one,hsanjuan/one,cloudweavers/one,mattthias/one,mattthias/one,alvarosimon/one,mattthias/one,tuxmea/one,abelCoronado93/one,hsanjuan/one,tuxmea/one,ggalancs/one,spirit03/one,abelCoronado93/one,cloudweavers/one,ggalancs/one,fasrc/one,Terradue/one,ggalancs/one,juanmont/one,atodorov-storpool/one,OpenNebula/one,juanmont/one,ggalancs/one,atodorov-storpool/one,hsanjuan/one,spirit03/one,abelCoronado93/one,fasrc/one,OpenNebula/one,alvarosimon/one,spirit03/one,abelCoronado93/one,abelCoronado93/one,abelCoronado93/one,tuxmea/one,spirit03/one,ohamada/one,alvarosimon/one,hsanjuan/one,baby-gnu/one,ohamada/one,tuxmea/one,spirit03/one,spirit03/one,goberle/one,cloudweavers/one,ggalancs/one,juanmont/one,ohamada/one,alvarosimon/one,baby-gnu/one,dberzano/opennebula-torino