TRUNK-4378 Add OpenmrsComponent annotation

(cherry picked from commit 7c13fb80212be503667d4608d50cc77f466fb44e)

Conflicts:
	api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
Fixed stray changes in 1.10 in liquibase update file