Revert modifying cdap-default and cdap-site files and modify user directory in master instead