KCINFR-979: defining budget salary api, moving s2s user defined service to where it is used.
Merge pull request #198 from leoherbie/s2s_uaf_salary_api2

KCINFR-979: defining budget salary api, moving s2s user defined service ...
KRACOEUS-6956 : repack propdev minor changes
KRACOEUS-6956 : repack propdev person-keyperson
Merge pull request #200 from yyuan1/move_keyperson_and_minor

Move keyperson and minor
KRACOEUS-7220 : Include script.cleanup option in mvn dev profile.
Merge pull request #207 from blackcathacker/script_cleanup2

KRACOEUS-7220 : Include script.cleanup option in mvn dev profile.
Merge remote-tracking branch 'upstream/master' into KRACOEUS-7002

Conflicts:
	coeus-code/src/main/java/org/kuali/coeus/propdev/impl/core/ProposalDevelopmentDocumentForm.java