master-qa-8995

http://issues.liferay.com/browse/LIFERAYQA-8995

@brianchandotcom
We are splitting up the logic between the 2 classes because we need to do some things differently within the Mobile Driver.  Those commits will come later if these changes get approved.