Merge -c 1232322 from trunk to branch-0.23 to fix HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for backward compatibility.