CLC-1725 QA branch fixes for fcntl load issue

QA branch fix. 
JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1725