Merge remote-tracking branch 'origin/RC20140724' into release-candidate

* origin/RC20140724:
  BZ-12966: fixed neProp directive when $table is removed
Merge remote-tracking branch 'origin/release-candidate' into RC20140724

* origin/release-candidate: