Set discover/portal doc dir to "portal"
LRDOCS-1511 Get a file's parent folder by calling file.getParentFile() instead of working with its file path string.
Merge branch 'master' into fix-utils-for-windows

Conflicts:
	lib/liferay-doc-utils.jar
Merge pull request #1125 from jhinkey/fix-utils-for-windows

Important: liferay-doc-utils bug fix for windows