Re-add siesta + siesta-test plugins
Merge branch 'move-rest-api-to-plugin' into siesta-plugin2

Conflicts:
	nexus/nexus-core-plugins/pom.xml
Merge branch 'move-rest-api-to-plugin' into siesta-plugin2

Conflicts:
	nexus/nexus-core-plugins/pom.xml
Merge branch 'move-rest-api-to-plugin' into siesta-plugin2
update for upstream changes
Merge branch 'move-rest-api-to-plugin' into siesta-plugin2
Merge branch 'master' into siesta-plugin2
Move to plugins directory
Merge branch 'master' into siesta-plugin2
update headers
Merge branch 'master' into siesta-plugin2

Conflicts:
	nexus/plugins/pom.xml
Merge branch 'master' into siesta-plugin2
Move into new location, update versions
Merge branch 'master' into siesta-plugin2

Conflicts:
	plugins/pom.xml
Merge branch 'master' into siesta-plugin2
Checkpoint some work, pending more changes before this is usable.
Merge branch 'master' into siesta-plugin2
Merge branch 'master' into siesta-plugin2
More configuration for aspectj
Drop aspectj