Added AbstractApplicationService to Common plugin
Added AbstractConflictDetector to Common plugin
Simple code cleanup