AMBARI-1899. ambari-reset does not respect -s. (swagle)

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