Added warning if XML file is found in services directory with a root element other than services
Merge remote-tracking branch 'upstream/master'