Moved servlet annotation deployment enrichers to their own package
Added support for metadata-complete=true (fixes #3)