ORA2 release-2014-07-07T19.28

@stephensanchez Looks good?

@adampalay Planning on getting this into the RC for this week.  This includes one migration that we've tested in dev.