Merge branch 'update_net_framework_4' into dev_oracle
Merge branch 'update_oracledataaccess_provider' into dev_oracle
Merge branch 'fix-statement-splitter-oracle' into dev_oracle

Conflicts:
	product/roundhouse/infrastructure/persistence/NHibernateSessionFactoryBuilder.cs
Merge branch 'run_before_up_as_admin' into dev_oracle