rhbz1002340 - prevent ajax race condition
Merge branch 'release' into integration/master