Merge remote-tracking branch 'origin/UAR-629' into UAR-687
UAR-687 remove import to custom class

UAR-687 Fixing import and ref to ProtocolAttachmentProtocol

UAR-687 depends on UAR-629. CustomProtocolXmlStream.java imports ProtocolAttachmentProtocol. Origianlly, in UAR-629, we created a CustomProtocolAttachmentProtocol.java but that was removed and we went back to using the org.kuali....ProtocolAttachmentProtocol.

This was fixed manually durring the last merge to development for UAR-629. However, this was never fixed in the UAR-687 branch. Since this removal was never fixed in the UAR-687 branch, we need to implement the same fix here so it will be merged correctly into the release branch and eventually master.
UAR-831 Merge feature branch 'UAR-629' into release

Conflicts:
	src/main/java/org/kuali/kra/irb/actions/ProtocolProtocolActionsAction.java
	src/main/resources/META-INF/kc-config-defaults.xml
	src/main/resources/edu/arizona/kra/CustomCoreSpringBeans.xml
UAR-831 Merge feature branch 'UAR-675' into release

Conflicts:
	src/main/resources/edu/arizona/kra/datadictionary/CustomProtocolOnlineReview.xml
UAR-803 Merge feature branch 'UAR-687' into release

Conflicts:
	src/main/resources/edu/arizona/kra/irb/CustomIrbSpringBeans.xml
UAR-803 Merge feature branch 'UAR-706' into release
UAR-803 Merge feature branch 'UAR-743' into release

Conflicts:
	src/main/config/xsd/printing/irb.xsd
	src/main/java/org/kuali/kra/committee/print/ScheduleXmlStream.java
UAR-831 Merge feature branch 'UAR-757' into release
UAR-831 Merge feature branch 'UAR-760' into release

Conflicts:
	src/main/java/org/kuali/kra/protocol/ProtocolBase.java
UAR-831 Merge feature branch 'UAR-780' into release

Conflicts:
	src/main/java/org/kuali/kra/protocol/actions/ActionHelperBase.java
UAR-831 Merge feature branch 'UAR-792' into release

Conflicts:
	src/main/java/org/kuali/kra/protocol/ProtocolBase.java
UAR-831 Merge feature branch 'UAR-830' into release

Conflicts:
	pom.xml
UAR-868 Merge branch 'UAR-626' into release

Conflicts:
	src/main/webapp/css/uar_kuali_application.css
UAR-868 Merge branch 'UAR-661' into release

Conflicts:
	src/main/java/org/kuali/kra/protocol/noteattachment/ProtocolAttachmentProtocolBase.java
UAR-868 Merge branch 'UAR-756' into release
UAR-868 Merge branch 'UAR-790' into release

Conflicts:
	src/main/resources/edu/arizona/kra/irb/CustomIrbSpringBeans.xml
UAR-868 Merge branch 'UAR-806' into release
UAR-868 Merge branch 'UAR-818' into release
UAR-868 Merge branch 'UAR-823' into release
UAR-868 Merge branch 'UAR-847' into release