Merge branch 'eugenia/asterix_sdk_stable' of https://code.google.com/p/asterixdb into eugenia/asterix_sdk_stable