Remove hidden quote items on quote merge
Reformatted config xml to match coding standard