OOZIE-670 Merge addtowar and oozie-setup scripts into one (bowenzhangusa via tucu)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1469612 13f79535-47bb-0310-9956-ffa450edef68