merge from asterix_stabilization_ioc_installer r1260:1314

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_ioc@1315 eaa15691-b419-025a-1212-ee371bd00084